moved AwaitsFix to class level