We don't need this hack anymore
workque: fix