Fixing issue #181.

This resolves Issue #181.

<!---
@huboard:{"order":17.7099609375,"milestone_order":414,"custom_state":""}
-->