diff --git a/1.4/Assemblies/AchtungMod.dll b/1.4/Assemblies/AchtungMod.dll
index 2d0e416..ee24971 100644
Binary files a/1.4/Assemblies/AchtungMod.dll and b/1.4/Assemblies/AchtungMod.dll differ
diff --git a/About/About.xml b/About/About.xml
index d8a22e5..4874032 100644
--- a/About/About.xml
+++ b/About/About.xml
@@ -18,7 +18,7 @@
     </li>
   </modDependencies>
   <packageId>brrainz.achtung</packageId>
-  <modVersion>3.8.5.0</modVersion>
+  <modVersion>3.8.6.0</modVersion>
   <steamAppId>730936602</steamAppId>
   <url>https://github.com/pardeike/Achtung2</url>
   <description>Command your colonists like a boss!
diff --git a/About/Manifest.xml b/About/Manifest.xml
index a5d27dd..4802961 100644
--- a/About/Manifest.xml
+++ b/About/Manifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <Manifest>
   <identifier>net.pardeike.rimworld.mod.achtung</identifier>
-  <version>3.8.5.0</version>
+  <version>3.8.6.0</version>
   <targetVersions>
     <li>1.0.0</li>
     <li>1.1.0</li>
diff --git a/Directory.Build.props b/Directory.Build.props
index d9de3b9..6b60c47 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -4,7 +4,7 @@
 		<ModName>Achtung</ModName>
 		<ModFileName>Achtung</ModFileName>
 		<Repository>https://github.com/pardeike/Achtung2</Repository>
-		<ModVersion>3.8.5.0</ModVersion>
+		<ModVersion>3.8.6.0</ModVersion>
 		<ProjectGuid>{8BD5A28F-96C4-43B4-907F-600AA0162F84}</ProjectGuid>
 	</PropertyGroup>
 
diff --git a/Source/DynamicWorkTypes.cs b/Source/DynamicWorkTypes.cs
index 24c185f..b1f618e 100644
--- a/Source/DynamicWorkTypes.cs
+++ b/Source/DynamicWorkTypes.cs
@@ -40,7 +40,7 @@ static void Reload<T>() where T : Def
 
 		static void UpdatePawns(int index, int copyFrom)
 		{
-			Find.Maps.Do(map => map.mapPawns.AllPawnsSpawned.DoIf(p => p.workSettings != null, p =>
+			Find.Maps.Do(map => map.mapPawns.AllPawnsSpawned.DoIf(p => p.workSettings?.priorities != null, p =>
 			{
 				if (p.workSettings.EverWork)
 				{
diff --git a/Source/ForcedMultiFloatMenuOption.cs b/Source/ForcedMultiFloatMenuOption.cs
index 471ebfd..4f3c2f7 100644
--- a/Source/ForcedMultiFloatMenuOption.cs
+++ b/Source/ForcedMultiFloatMenuOption.cs
@@ -22,7 +22,7 @@ public class ForcedMultiFloatMenuOption : FloatMenuOption
 		public bool actionSelected = false;
 
 		public static float buttonSpace = 10;
-		public static float buttonSize = 16;
+		public static float buttonWidth = 32;
 
 		public ForcedMultiFloatMenuOption(List<Pawn> forcedPawns, List<FloatMenuOption> options, Func<Rect, bool> originalExtraPartOnGUI, string label)
 			: base(label, null, MenuOptionPriority.Default, null, null, 0f, null, null, false, 0)
@@ -36,16 +36,16 @@ public ForcedMultiFloatMenuOption(List<Pawn> forcedPawns, List<FloatMenuOption>
 				return RenderExtraPartOnGui(extraPartRect);
 			};
 			// somehow necessary or else 'extraPartWidth' will be 0
-			extraPartWidth = buttonSpace + buttonSize;
+			extraPartWidth = buttonSpace + buttonWidth;
 		}
 
 		public bool RenderExtraPartOnGui(Rect drawRect)
 		{
 			var rect = drawRect;
-			rect.xMin = rect.xMax - buttonSize;
+			rect.xMin = rect.xMax - buttonWidth;
 			rect = rect.Rounded();
 			var buttonRect = rect;
-			var padding = Mathf.FloorToInt((rect.height - buttonSize) / 2);
+			var padding = Mathf.FloorToInt((rect.height - 16) / 2);
 			rect.y += padding;
 			rect.height -= 2 * padding;