KFSUPGRADE-1017 fix for issue with fixtures