diff --git a/src/data.js b/src/data.js
index 931ea8384..cc027158c 100644
--- a/src/data.js
+++ b/src/data.js
@@ -1,7 +1,7 @@
 (function( jQuery ) {
 
 var windowData = {},
-	rnum = /^-?[0-9.]+$/;
+	rnum = /^-?\d+(?:\.\d+)$/;
 
 jQuery.extend({
 	cache: {},
diff --git a/test/unit/data.js b/test/unit/data.js
index 9d43cb59a..68e24b63d 100644
--- a/test/unit/data.js
+++ b/test/unit/data.js
@@ -158,7 +158,7 @@ test(".data(String) and .data(String, Object)", function() {
 });
 
 test("data-* attributes", function() {
-	expect(20);
+	expect(22);
 	var div = jQuery("<div>"),
 		child = jQuery("<div data-myobj='old data' data-ignored=\"DOM\"></div>");
 		
@@ -184,6 +184,8 @@ test("data-* attributes", function() {
 		.attr("data-false", "false")
 		.attr("data-five", "5")
 		.attr("data-point", "5.5")
+		.attr("data-pointbad", "5..5")
+		.attr("data-pointbad2", "-.")
 		.attr("data-null", "null")
 		.attr("data-string", "test");
 	
@@ -191,6 +193,8 @@ test("data-* attributes", function() {
 	equals( child.data('false'), false, "Primitive false read from attribute");
 	equals( child.data('five'), 5, "Primitive number read from attribute");
 	equals( child.data('point'), 5.5, "Primitive number read from attribute");
+	equals( child.data('pointbad'), "5..5", "Bad number read from attribute");
+	equals( child.data('pointbad2'), "-.", "Bad number read from attribute");
 	equals( child.data('null'), null, "Primitive null read from attribute");
 	equals( child.data('string'), "test", "Typical string read from attribute");