potential fix for issue #350