fixed bugs round 4