Fix TF egghandler again..