corrected 2 issues with equals removal