Index: trunk/data/validator/combinations.mapcss
===================================================================
--- trunk/data/validator/combinations.mapcss	(revision 11591)
+++ trunk/data/validator/combinations.mapcss	(revision 11687)
@@ -436,11 +436,10 @@
 }
 
-/* #13138 */
-area:closed[water][natural!=water][water!=intermittent] { /* water=intermittent is deprecated and has an own warning */
+/* #13138, 14468 */
+area:closed[water][natural!~/water|bay|strait/][water!=intermittent] { /* water=intermittent is deprecated and has an own warning */
   throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
   group: tr("missing tag");
-  fixAdd: "natural=water";
-}
-way!:closed[water][natural!=water][water!=intermittent] {
+}
+way!:closed[water][natural!~/water|bay|strait/][water!=intermittent] {
   throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
   group: tr("missing tag");