*8736* Fix ID clash