Fixed an issue with the callback setup in the client code