Fix queue_classic (numerous tries but I'm rebasing and force pushing :) )