async fix, bubblegum solution