Fix for issue #446