Fixed map a little