Fixed completions in functions