Fix for #408 - water surfaces flickering