Fix it once and for all