Fixing Watermark parser