fixed static fields in singleton