Remove potential id conflict