[82] Some fix to the last commit

* Not yet completed
* This will prevent spamming jobs to output queue