Bug fix wrt watermarking