Fix for fields that were not being created and added to templates in some cases