Fixed equality vs identity bug