Fix the integer id issue