Fixed incorrect mapped field incl map positions