Fix asynchronous non-sense...