Fix for clientApi to allow callbacks.