Watermark fix