Fixed struct init