Fix extra qualification