--- a/src/INICommand.cpp	Wed Nov 25 21:35:07 2020 +0100
+++ b/src/INICommand.cpp	Thu Nov 26 00:38:44 2020 +0100
@@ -29,6 +29,7 @@
 #include "INICommand.h"
 #include "lib/INIReader.h"
 #include "lib/BasicUnescapingINIHandler.h"
+#include "lib/JavaPropertiesUnescapingINIHandler.h"
 
 using namespace std;
 using namespace relpipe::writer;
@@ -170,8 +171,9 @@
 	FlatINIContentHandler handler(writer, configuration);
 	std::shared_ptr<INIReader> reader(INIReader::create(input));
 	// TODO: configure the INIReader (features/properties) according to our Configuration (sub-keys etc.)
-	BasicUnescapingINIContentHandler unescapingHandler(handler, true);
-	reader->addHandler(&unescapingHandler);
+	BasicUnescapingINIContentHandler unescapingHandler(handler, false);
+	JavaPropertiesUnescapingINIContentHandler javaHandler(unescapingHandler, true);
+	reader->addHandler(&javaHandler);
 	reader->process();
 
 }