Fix struct static method system