[KFSQA-1012] Fix needed to keep KFSQA-970 working with KFSQA-1012 changes