Fix shadowing properties