Fix for issue #103