fix issue #84,#85