Fixing overqualified access