fixed 3 bug of 5