Function call fix