fix cases of getting confused if something is mapped or not. only use the mapped...