Fix for issue #251