Fix for http://eclip.se/414211
Merge pull request #78 from zulus/bug_414211

Fix for http://eclip.se/414211