Fix order of operations in OOF init