Fix bug #237