Corrected errors with EquationSelector