Bug fix/issue#2068

#2068
![screenshot from 2014-07-08 08 50 42](https://cloud.githubusercontent.com/assets/1647915/3635967/c3be4a9e-0f95-11e4-8575-a57b885bb8a0.png)