cf fix + watermark