Fix bug #41