Follow-up to https://github.com/XaF/omni/pull/610
Follow-up to #610