fix for issue #373