Possible fix for issue #446