fix for issue #350