Fixing function calls