Fix QA for pull #980