Finally fixed issue #125