One more escaped id fix