Fix for issue #101