Static methods fixed