Fix bug #26