Fix field id bug