Fix TF egg handler