Custom id fix