Fix an order of Q issue