Fix #776



<!---
@huboard:{"order":530.875,"milestone_order":782,"custom_state":""}
-->