diff --git a/js/WP-GPX-Maps.js b/js/WP-GPX-Maps.js
index 2d52b2f..64442a0 100644
--- a/js/WP-GPX-Maps.js
+++ b/js/WP-GPX-Maps.js
@@ -884,8 +884,8 @@ var WPGPXMAPS = {
 				var ngg_span_a = ngg_span.children[0];
 
 				var pos = [
-					Number( ngg_span.getAttribute( 'lat' ) ),
-					Number( ngg_span.getAttribute( 'lon' ) )
+					Number( ngg_span.getAttribute( 'data-lat' ) ),
+					Number( ngg_span.getAttribute( 'data-lon' ) )
 				];
 
 				map.Bounds.push( pos );
@@ -1503,8 +1503,8 @@ var WPGPXMAPS = {
 		var divImages = document.getElementById( "ngimages_" + targetId );
 		var img_spans = divImages.getElementsByTagName( "span" );
 		for ( var i = 0; i < img_spans.length; i++ ) {
-			var imageLat = img_spans[i].getAttribute( 'lat' );
-			var imageLon = img_spans[i].getAttribute( 'lon' );
+			var imageLat = img_spans[i].getAttribute( 'data-lat' );
+			var imageLon = img_spans[i].getAttribute( 'data-lon' );
 
 			imageLat = imageLat.replace( ",", "." );
 			imageLon = imageLon.replace( ",", "." );
diff --git a/wp-gpx-maps.php b/wp-gpx-maps.php
index 3dd9c67..8922358 100644
--- a/wp-gpx-maps.php
+++ b/wp-gpx-maps.php
@@ -647,7 +647,7 @@ function wpgpxmaps_handle_shortcodes( $attr, $content = '' ) {
 		foreach ( $ngimgs as $img ) {
 			$data         = $img['data'];
 			$data         = str_replace( '\n', '', $data );
-			$ngimgs_data .= '<span lat="' . $img['lat'] . '" lon="' . $img['lon'] . '">' . $data . '</span>';
+			$ngimgs_data .= '<span data-lat="' . $img['lat'] . '" data-lon="' . $img['lon'] . '">' . $data . '</span>';
 		}
 	}
 
@@ -656,7 +656,7 @@ function wpgpxmaps_handle_shortcodes( $attr, $content = '' ) {
 		foreach ( $attimgs as $img ) {
 			$data         = $img['data'];
 			$data         = str_replace( '\n', '', $data );
-			$ngimgs_data .= '<span lat="' . $img['lat'] . '" lon="' . $img['lon'] . '">' . $data . '</span>';
+			$ngimgs_data .= '<span data-lat="' . $img['lat'] . '" data-lon="' . $img['lon'] . '">' . $data . '</span>';
 		}
 	}