Fix for issue #199