diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0d10af..444f79f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Change Log
 
+## [2.1.2] - 28-03-2018
+### Fixes
+- Fix `RESIDUE_HOME` if not available
+
 ## [2.1.1] - 27-03-2018
 ### Updates
 - Moved exceptions out of include for native bindings
diff --git a/CMakeLists.txt b/CMakeLists.txt
index da00303..6360dbb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,7 +11,7 @@ option (special_edition "Special edition build" OFF)
 
 set (RESIDUE_MAJOR "2")
 set (RESIDUE_MINOR "1")
-set (RESIDUE_PATCH "1")
+set (RESIDUE_PATCH "2")
 
 set (RESIDUE_SOVERSION "${RESIDUE_MAJOR}.${RESIDUE_MINOR}.${RESIDUE_PATCH}")
 set (RESIDUE_NAME "Residue-C++")
diff --git a/src/residue.cc b/src/residue.cc
index 64b8a27..22bd65d 100644
--- a/src/residue.cc
+++ b/src/residue.cc
@@ -780,7 +780,7 @@ void Residue::loadConnectionFromJson_(const std::string& connectionJson)
 
 std::string& Residue::resolveResidueHomeEnvVar(std::string& str)
 {
-    auto pos = str.find_first_of("$RESIDUE_HOME");
+    auto pos = str.find("$RESIDUE_HOME");
     if (pos != std::string::npos) {
         std::string val = m_homepath.empty() ?
                     el::base::utils::OS::getEnvironmentVariable("RESIDUE_HOME", "", "echo $RESIDUE_HOME") :