Fix for issue #149