Fixed Asynchronous Issues