Fix bug #111