Fix for issue #250