Fixed initialization order