Fix bug #442