fix variable collision introduced in r49324