Fix function abstraction