Fixed .equals method