fixed little bug with mapping