Same again - get rid of the water exception
And how about lava?