Bug with equals check fixed