Map correctly