fixed and == issue