Fix map which was not working on iOS8