Fix it right the first time