Fix bug #478