minor 1.6 upgrade change