Fix Static Methods