Bug fix in VF-5864 regression test