Another attempt at floor flag fixup