Possible fix for not saving queue type