additional changes required for 1.4