Fixed map changing, again.