Fix for callbacks to the server being lost