WFS fix