Fix more trapd with queue