Make evaporate overlay more robust