static method fixes