Fix field issue