change mapping behaviour