diff --git a/Subsurface/Source/Characters/Character.cs b/Subsurface/Source/Characters/Character.cs
index 1a10d10b8..0b7cfa7ea 100644
--- a/Subsurface/Source/Characters/Character.cs
+++ b/Subsurface/Source/Characters/Character.cs
@@ -508,13 +508,12 @@ namespace Barotrauma
 
             Properties = ObjectProperty.GetProperties(this);
 
+            Info = characterInfo;
             if (file == humanConfigFile && characterInfo == null)
             {
                 Info = new CharacterInfo(file);
             }
 
-            Info = characterInfo;
-
             XDocument doc = ToolBox.TryLoadXml(file);
             if (doc == null || doc.Root == null) return;
 
diff --git a/Subsurface/Submarines/Aegir Mark III.sub b/Subsurface/Submarines/Aegir Mark III.sub
index 1bd371c82..2d0af9d3e 100644
Binary files a/Subsurface/Submarines/Aegir Mark III.sub and b/Subsurface/Submarines/Aegir Mark III.sub differ
diff --git a/Subsurface/Submarines/Nehalennia.sub b/Subsurface/Submarines/Nehalennia.sub
index 5eff334a3..2f0998ed3 100644
Binary files a/Subsurface/Submarines/Nehalennia.sub and b/Subsurface/Submarines/Nehalennia.sub differ
diff --git a/Subsurface/Submarines/Vellamo.sub b/Subsurface/Submarines/Vellamo.sub
index 41789877e..210ca0dfe 100644
Binary files a/Subsurface/Submarines/Vellamo.sub and b/Subsurface/Submarines/Vellamo.sub differ
diff --git a/Subsurface/config.xml b/Subsurface/config.xml
index 12baf166c..32c3373d6 100644
--- a/Subsurface/config.xml
+++ b/Subsurface/config.xml
@@ -2,5 +2,5 @@
 <config masterserverurl="http://www.undertowgames.com/baromaster" autocheckupdates="true" musicvolume="0.0" soundvolume="0.0" verboselogging="true">
   <graphicsmode width="1280" height="720" fullscreen="false" />
   <contentpackage path="Data/ContentPackages/Vanilla 0.3.xml" />
-  <keymapping Select="E" Use="0" Aim="1" Up="W" Down="S" Left="A" Right="D" Run="LeftShift" Crouch="LeftControl" Chat="Tab" CrewOrders="C" />
+  <keymapping Select="E" Use="0" Aim="1" Up="W" Down="S" Left="A" Right="D" Attack="R" Run="LeftShift" Crouch="LeftControl" Chat="Tab" CrewOrders="C" />
 </config>
\ No newline at end of file