Collage fix for command threads spinning