Subject: [PATCH] fix issue #507

From 56bb8acb7ff28960d46f29f1059bf404fcf63288 Mon Sep 17 00:00:00 2001
From: Evgeny Cherpak <evgeny@cloudengines.com>
Date: Mon, 23 Sep 2013 10:21:25 +0300