diff --git a/src/ChartInternal/shape/point.ts b/src/ChartInternal/shape/point.ts
index 34dc1801c..b9d787a82 100644
--- a/src/ChartInternal/shape/point.ts
+++ b/src/ChartInternal/shape/point.ts
@@ -446,7 +446,8 @@ export default {
 
 		return function(method, context, ...args) {
 			return function(d) {
-				const id: string = d.id || (d.data && d.data.id) || d;
+				const id: string = $$.getTargetSelectorSuffix(d.id || (d.data && d.data.id) || d);
+
 				const element = d3Select(this);
 
 				ids.indexOf(id) < 0 && ids.push(id);
diff --git a/test/shape/point-spec.ts b/test/shape/point-spec.ts
index fd3c19650..cfac68502 100644
--- a/test/shape/point-spec.ts
+++ b/test/shape/point-spec.ts
@@ -81,7 +81,7 @@ describe("SHAPE POINT", () => {
 				data: {
 					columns: [
 						["data1", 30, 200, 100, 400, -150, 250],
-						["data2", 50, 20, 10, 40, 15, 25],
+						["data 2", 50, 20, 10, 40, 15, 25],
 						["data3", -150, 120, 110, 140, 115, 125]
 					]
 				},