diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6707060c..e94d0f24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+### Fixed
+
+- Fixed breaking bug in `resin local ssh`
+
 ## [5.10.0] - 2017-05-22
 
 ### Added
diff --git a/build/actions/local/common.js b/build/actions/local/common.js
index 512e5903..c103a33d 100644
--- a/build/actions/local/common.js
+++ b/build/actions/local/common.js
@@ -94,4 +94,4 @@ exports.pipeContainerStream = Promise.method(function(arg) {
   });
 });
 
-exports.getSubShellCommand = require('../../utils/helpers');
+exports.getSubShellCommand = require('../../utils/helpers').getSubShellCommand;
diff --git a/lib/actions/local/common.coffee b/lib/actions/local/common.coffee
index 02d636e4..f983db2b 100644
--- a/lib/actions/local/common.coffee
+++ b/lib/actions/local/common.coffee
@@ -58,4 +58,4 @@ exports.pipeContainerStream = Promise.method ({ deviceIp, name, outStream, follo
 			return console.log(chalk.red.bold("Container '#{name}' not found."))
 		throw err
 
-exports.getSubShellCommand = require('../../utils/helpers')
+exports.getSubShellCommand = require('../../utils/helpers').getSubShellCommand