Fix bug #548