Water / Lava bug fix