Fix manually removing conditions