TS-1475: Fix problems with xfd use.