Fix for issue #90