Fix bug #115