Changed how static initialization is skipped