Fixed problem with asyncronous rpc calls