FIXUP #1698