Fix init order