alphapapa Fix: Disambiguate custom IDs