two-step fix()