Fixed initialization order warning