Extended watermark support fixed