Tiamat/Hydra fix and changed obsolete function