Fixed problem with static fields.