Customer id fix