Discussion bug fixes #4561

![screenshot from 2014-06-19 15 57 30](https://cloud.githubusercontent.com/assets/383630/3328969/1eac1f26-f7c2-11e3-8c23-e7542c909463.png)