Weird id issues fix.