Fix field conflict