Fixed optional watermark code

(^^;)