Async stuff fix (?)