Fix for bug #446