Fixed create_fields