Fix for issue #67