fix partially issue #37