Multiple function call fix