Fixed asynchronous behaviour