Fix shadowing with shameful hack