fix the fixed id issue