Fix bug #528610