Fix initialization order