Fix Generating of Fields