client function mapping fix

Dirty but effective