Fix field generation