Async fix by Daan