Fix FBTest 6291 after commit 9e4b939