fixed bugs round 3