Fixed a bug with the async call stuff