fix for issue #354