Fixed eval dection in DIE handler