Fix for issue #373