Fix in handling initial values of static fields