Fix TFW creation