Initialization order fix