Fix issue #127