minor but crucial modification needed for 7_1_0