attempt to fix race condition on complete