Fix for issue #107