Fix new case of shadowing