Bug elimination round 1.