Bug fix/issue#2173

#2173
![screenshot from 2014-07-14 14 31 09](https://cloud.githubusercontent.com/assets/1647915/3635991/3c30fd68-0f97-11e4-88df-38eb6b6c6294.png)