Integrate fix from Mike, equals()