Fix commit FQA-2022