@@ -257,14 +257,12 @@
 					    "Warning: Invalid environment "
 					    "variable: %s\n", tmp.UTF8String);
 					continue;
 				}
 
-				key = [tmp substringWithRange:
-				    of_range(0, pos)];
-				value = [tmp substringWithRange:
-				    of_range(pos + 1, tmp.length - pos - 1)];
+				key = [tmp substringToIndex: pos];
+				value = [tmp substringFromRange: pos + 1];
 
 				[_environment setObject: value
 						 forKey: key];
 
 				objc_autoreleasePoolPop(pool);
@@ -303,14 +301,12 @@
 					    "Warning: Invalid environment "
 					    "variable: %s\n", tmp.UTF8String);
 					continue;
 				}
 
-				key = [tmp substringWithRange:
-				    of_range(0, pos)];
-				value = [tmp substringWithRange:
-				    of_range(pos + 1, tmp.length - pos - 1)];
+				key = [tmp substringToIndex: pos];
+				value = [tmp substringFromIndex: pos + 1];
 
 				[_environment setObject: value
 						 forKey: key];
 
 				objc_autoreleasePoolPop(pool);