Yet another mapping overload fix