fixed equality issues