Boats clipping through blocks in 1.17 beta

If a boat is placed in a strip of water that is at least 1 block wide in either direction, or pushed into a corner by water, upon exit it will clip through the surrounding blocks and disappear.