fixed 2 bug of 5