propose new candidate fix for map issue