Fixed inconsistent synchronization
Make public static fields final