for issue #6, and fix ut bug