Fixed q3.17