static method handling fix