Get rid of static inline function