Fix for issue #96