Hydra/Tiamat fix