Problems regarding QueueSet fixed