Fixed issue #125