Fixed up shadowed type