Boat "lid" rendering entities partially invisible

The boat "lid" isn't working quite right. It sometimes still lets water render in the boats, as it appears to flicker in and out frequently; and other times it renders part of the player/animals invisible, since the lid renders before the entity inside the boat.

To Reproduce, just enter a boat (if the boat is filled with water, exit and re-enter it).