Fix ID attribution