Fixed Q5 and Q7