Fixing last issue with constraints regarding WATERMARKs