Fixed trap queue bug