Fixed equals bug