diff --git a/fooocus_version.py b/fooocus_version.py
index a63055f8..28c75ebe 100644
--- a/fooocus_version.py
+++ b/fooocus_version.py
@@ -1 +1 @@
-version = '2.0.16'
+version = '2.0.17'
diff --git a/modules/expansion.py b/modules/expansion.py
index 83d38906..8b339f83 100644
--- a/modules/expansion.py
+++ b/modules/expansion.py
@@ -1,3 +1,5 @@
+import torch
+
 import comfy.model_management as model_management
 
 from transformers import AutoTokenizer, AutoModelForCausalLM, set_seed
@@ -29,15 +31,20 @@ class FooocusExpansion:
     def __init__(self):
         self.tokenizer = AutoTokenizer.from_pretrained(fooocus_expansion_path)
         self.model = AutoModelForCausalLM.from_pretrained(fooocus_expansion_path)
-
-        if model_management.should_use_fp16():
-            self.model.half()
+        self.model.eval()
 
         load_device = model_management.text_encoder_device()
+
+        if 'mps' in load_device.type:
+            load_device = torch.device('cpu')
+
+        if 'cpu' not in load_device.type and model_management.should_use_fp16():
+            self.model.half()
+
         offload_device = model_management.text_encoder_offload_device()
         self.patcher = ModelPatcher(self.model, load_device=load_device, offload_device=offload_device)
 
-        print(f'Fooocus Expansion engine loaded.')
+        print(f'Fooocus Expansion engine loaded for {load_device}.')
 
     def __call__(self, prompt, seed):
         model_management.load_model_gpu(self.patcher)