Fixed calling functions