merged minor tweak from 3.18