Fixed static initialization