Fix issue #125