fix the integer issues