client function mapping fix