fix before_send logic