Fix bug #573