Fix out-of-order initialization