Fix function set