bugfix 6.10 round 2