Bug fix/issue#2088

#2088
![screenshot from 2014-07-14 00 20 07](https://cloud.githubusercontent.com/assets/1647915/3635995/a54fdbac-0f97-11e4-8d7d-5ef994fbe012.png)