Fix definition according to functions