fix static fields