Fix to current mapping logic