Fix for issue # 204.

Creating pull request for # 268 again with a single commit.