Fix for issue #375