Fix for issue #392