Bug fix #446