fix queue behavior