Fix a problem with xmap.