fixing queue behavior