fixed the non static functions expected to be called statically