Bug-fix:

 - Expand candidate list for mapping