Fix the q3 problem