mathias fixed links from map