fixing issues with async update