Adapt for process 1.2.*