Fixed #446