fixed bugs round 5