Fix for issue #105