diff --git a/ext/et/main.php b/ext/et/main.php
index 6b087d57..65b72b97 100644
--- a/ext/et/main.php
+++ b/ext/et/main.php
@@ -54,7 +54,7 @@ class ET extends Extension {
 		$info['thumb_quality']	= $config->get_int('thumb_quality');
 		$info['thumb_width']	= $config->get_int('thumb_width');
 		$info['thumb_height']	= $config->get_int('thumb_height');
-		$info['thumb_mem']		= $config->get_int("thumb_max_memory");
+		$info['thumb_mem']		= $config->get_int("thumb_mem_limit");
 
 		$info['stat_images']   = $database->get_one("SELECT COUNT(*) FROM images");
 		$info['stat_comments'] = $database->get_one("SELECT COUNT(*) FROM comments");
diff --git a/ext/handle_ico/main.php b/ext/handle_ico/main.php
index 7582fc53..1d642b0f 100644
--- a/ext/handle_ico/main.php
+++ b/ext/handle_ico/main.php
@@ -97,7 +97,7 @@ class IcoFileHandler extends Extension {
 		$w = $config->get_int("thumb_width");
 		$h = $config->get_int("thumb_height");
 		$q = $config->get_int("thumb_quality");
-		$mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB
+		$mem = $config->get_int("thumb_mem_limit") / 1024 / 1024; // IM takes memory in MB
 
 		if($config->get_bool("ico_convert")) {
 			// "-limit memory $mem" broken?
diff --git a/ext/handle_pixel/main.php b/ext/handle_pixel/main.php
index 2f1ba9ae..c6779247 100644
--- a/ext/handle_pixel/main.php
+++ b/ext/handle_pixel/main.php
@@ -90,7 +90,6 @@ class PixelFileHandler extends DataHandlerExtension {
 		$w = $config->get_int("thumb_width");
 		$h = $config->get_int("thumb_height");
 		$q = $config->get_int("thumb_quality");
-		$mem = $config->get_int("thumb_max_memory") / 1024 / 1024; // IM takes memory in MB
 
 		// Windows is a special case
 		if(in_array("OS", $_SERVER) && $_SERVER["OS"] == 'Windows_NT') {
diff --git a/ext/image/main.php b/ext/image/main.php
index 836c65e9..29f71dc5 100644
--- a/ext/image/main.php
+++ b/ext/image/main.php
@@ -267,7 +267,9 @@ class ImageIO extends Extension {
 		$sb->add_int_option("thumb_quality");
 		$sb->add_label(" % quality ");
 
-		$sb->add_shorthand_int_option("thumb_mem_limit", "<br>Max memory use: ");
+		if($config->get_string("thumb_engine") == "gd") {
+			$sb->add_shorthand_int_option("thumb_mem_limit", "<br>Max memory use: ");
+		}
 
 		$event->panel->add_block($sb);
 	}