Fix bubble/scatter recognition