Fix it for real now