Queue id fix