fixed bugs round 2