Fixing async retrieval