Fixed a major bug for the async methods