Fixed bug introduced during mapping change