Fixed Async issue