Added a quick async fix