Changed the Goal equality function