fix bug in waiting for current user to complete