Fix bug #127