*8753* Make code consistent with OMP