Fix bug #233