queue fix and run condition
Revert "queue fix and run condition"

This reverts commit fa65cb617f5de9648636ec4afc05fbd2ae6908a4.