diff --git a/modules/Gpx/Gpx.c b/modules/Gpx/Gpx.c
index 3eab41c..ed0fef2 100644
--- a/modules/Gpx/Gpx.c
+++ b/modules/Gpx/Gpx.c
@@ -120,10 +120,9 @@ static int load_cg_main(int no) {
 	
 	sno = find_null_surface();
 	
-	sf->no = sno;
 	suf[sno] = sf;
 	
-	return sf->no;
+	return sno;
 }
 
 static void Init() {
@@ -165,7 +164,7 @@ static void Create() {
 		*var = 0;
 	} else {
 		int no = find_null_surface();
-		*var = s->no = no;
+		*var = no;
 		suf[no] = s;
 	}
 	
@@ -193,7 +192,7 @@ static void CreatePixelOnly() {
 		*var = 0;
 	} else {
 		int no = find_null_surface();
-		*var = s->no = no;
+		*var = no;
 		suf[no] = s;
 	}
 	
@@ -219,7 +218,7 @@ static void CreateAMapOnly() {
 		*var = 0;
 	} else {
 		int no = find_null_surface();
-		*var = s->no = no;
+		*var = no;
 		suf[no] = s;
 	}
 	
diff --git a/src/ags.h b/src/ags.h
index c35df8d..ed7fa16 100644
--- a/src/ags.h
+++ b/src/ags.h
@@ -62,8 +62,6 @@ typedef enum {
 } ALPHA_DIB_COPY_TYPE;
 
 struct agsurface {
-	int no;      /* surface number, primary DIB is 0 */
-	
 	int width;   /* width of surface  */
 	int height;  /* height of surface */
 	int depth;   /* depth of surface, 8/15/16/24/32 is available */