Bug Fix: for issue #581

![screenshot_2014-01-17-09-39-06](https://f.cloud.github.com/assets/5212844/1937019/51a604dc-7f18-11e3-8503-3dcb8953a032.png)