Edit to issue #446