fixed issue #72,#73,#74