Villages Generating on Rivers

Villagers keep on spawning on the new 1.18 rivers and blocking most of them up. Either have the structures raised over rivers with fences and planks or prevent villages from generating into rivers. Thank you!

This has been a problem since the wider rivers have been implemented.