Removing async issue