Fixup for operational-01