Fix MQA handling