FIX online id offline id conflicts