Bug fix/issue#2178

#2178
![screenshot from 2014-07-13 07 44 29](https://cloud.githubusercontent.com/assets/1647915/3635980/a2b4b454-0f96-11e4-8cf0-19a7965c4c5a.png)