Fix for issue #138