Fix to stupid TD