Fix for issue #93