Change order of initialization