Fixes #570

Before:
![screenshot from 2014-04-30 23 00 37](https://cloud.githubusercontent.com/assets/7119803/2855249/7d06b2e0-d15a-11e3-9ed1-728f0835ab35.png)


After:
![screenshot from 2014-04-30 22 59 13](https://cloud.githubusercontent.com/assets/7119803/2855237/6d08723e-d15a-11e3-9b2a-0cc739f2f737.png)