Fix for issue #160