fix for function calls