Move after L2744, to avoid unnecessary processing