Workaround for ID collision