CB-7063 (fix case of Q)