Fixing messed up calls