Fix bug of wrong operation queue being used