Fix bug #27