CS fix for InvalidQueueException