possible fix for issue #398