quick fix round 2