Improved the asynchronous behavior