Attempt fix for do_complete()