diff --git a/src/fat.c b/src/fat.c
index 8181f0f6..4f1091e8 100644
--- a/src/fat.c
+++ b/src/fat.c
@@ -1057,7 +1057,7 @@ int fat32_free_info(disk_t *disk_car,const partition_t *partition, const unsigne
 int check_VFAT_volume_name(const char *name, const unsigned int max_size)
 {
   unsigned int i;
-  for(i=0;name[i]!='\0' && i<max_size;i++)
+  for(i=0; i<max_size && name[i]!='\0'; i++)
   {
     if(name[i] < 0x20)
       return 1;
diff --git a/src/file_txt.c b/src/file_txt.c
index e6231b56..8d1ab164 100644
--- a/src/file_txt.c
+++ b/src/file_txt.c
@@ -640,7 +640,7 @@ static int header_check_mbox(const unsigned char *buffer, const unsigned int buf
   {
     unsigned int i;
     /* From someone@somewhere */
-    for(i=5; buffer[i]!=' ' && buffer[i]!='@' && i<200; i++);
+    for(i=5; i<200 && buffer[i]!=' ' && buffer[i]!='@'; i++);
     if(buffer[i]!='@')
       return 0;
   }