queue fix and run condition