Fix for issue #109