Closes #129 Fix issue with async update/execute