Fix for issue #92