Some fixed for initialization order problem