Improved "equals" logic :)