fixed bugs round 7