Do not choke on renamed items