Brute force solution to mapping issue