Possible fix for issue #395