Mapping is wrong, this was the best solution we came up with