Fixes #446