Fix bugs of FQA-2039