diff --git a/lib/aethyr/core/actions/commands/move.rb b/lib/aethyr/core/actions/commands/move.rb
index e7392c4e2aef4e0af45fd637fdaace48a8edb8fa..64638b6d3fcedde1b2b755465abeb643f711d41f 100644
--- a/lib/aethyr/core/actions/commands/move.rb
+++ b/lib/aethyr/core/actions/commands/move.rb
@@ -10,7 +10,7 @@ module Aethyr
           end
 
           def action
-            event = @data
+            event = @data.dup
             room = $manager.get_object(@player.container)
             exit = room.exit(event[:direction])
 
@@ -37,7 +37,7 @@ module Aethyr
             event[:to_blind_other] = "You hear someone leave."
 
             room.out_event(event)
-            look_text = new_room.look(player)
+            look_text = new_room.look(@player)
             out_text = Window.split_message(look_text, 79).join("\n")
             @player.output(out_text, message_type: :look, internal_clear: true)
           end
diff --git a/lib/aethyr/core/input_handlers/move.rb b/lib/aethyr/core/input_handlers/move.rb
index 0f0a5fe43192569830929865551127f5af21aafe..bcf66dd2cc2cdd75302c527398fb5bef97af95f9 100644
--- a/lib/aethyr/core/input_handlers/move.rb
+++ b/lib/aethyr/core/input_handlers/move.rb
@@ -49,8 +49,7 @@ EOF
             when /^go\s+(.*)$/i
               $manager.submit_action(Aethyr::Core::Actions::Move::MoveCommand.new(@player, {:direction => $1.downcase}))
             when /^(east|west|northeast|northwest|north|southeast|southwest|south|e|w|nw|ne|sw|se|n|s|up|down|u|d|in|out)(\s+\((.*)\))?$/i
-              action({:direction => expand_direction($1),
-              :pre => $3})
+              $manager.submit_action(Aethyr::Core::Actions::Move::MoveCommand.new(@player, {:direction => expand_direction($1), :pre => $3}))
             end
           end