Fix for issue #140