Fix bug #475