toplevel completion fix