Fixed issue #127