Fix to make sure all cases are covered (saving the file helps)