further 1.6.4 adjustments