TFD fixes are Here