modified some bug