Fix for issue #104