attempt to fix the race condition on status update