diff --git a/nandroid.c b/nandroid.c
index 9380ff7..e0aa757 100644
--- a/nandroid.c
+++ b/nandroid.c
@@ -143,9 +143,11 @@
 
     if (0 == (ret = get_partition_device("wimax", tmp)))
     {
-        char serialno[64];
+        char serialno[PROPERTY_VALUE_MAX];
         ui_print("Backing up WiMAX...\n");
-        sprintf(tmp, "%s/wimax.%s.img", backup_path, property_get("ro.serialno", serialno, ""));
+        serialno[0] = 0;
+        property_get("ro.serialno", serialno, "");
+        sprintf(tmp, "%s/wimax.%s.img", backup_path, serialno);
         ret = backup_raw_partition("wimax", tmp);
         if (0 != ret)
             return print_and_error("Error while dumping WiMAX image!\n");
@@ -297,8 +299,11 @@
     
     if (restore_wimax && 0 == (ret = get_partition_device("wimax", tmp)))
     {
-        char serialno[64];
-        sprintf(tmp, "%s/wimax.%s.img", backup_path, property_get("ro.serialno", serialno, ""));
+        char serialno[PROPERTY_VALUE_MAX];
+        
+        serialno[0] = 0;
+        property_get("ro.serialno", serialno, "");
+        sprintf(tmp, "%s/wimax.%s.img", backup_path, serialno);
 
         struct stat st;
         if (0 != stat(tmp, &st))
@@ -310,7 +315,7 @@
         }
         else
         {
-            ui_print("Restoring wimax image...\n");
+            ui_print("Restoring WiMAX image...\n");
             if (0 != (ret = restore_raw_partition("wimax", tmp)))
                 return ret;
         }