Fix for issue #98