Fix bug #479