Custom Id fix