Race condition handling
Update up to changes in dbjs-ext