Fix for issue #330