Fixed problem with \map options