Fix field map usage