Fix bug #22