diff --git a/MC/CustomGenerators/PWGDQ/Hijing_Jpsiee001.C b/MC/CustomGenerators/PWGDQ/Hijing_Jpsiee001.C
index b62496f0..fcc9db1a 100644
--- a/MC/CustomGenerators/PWGDQ/Hijing_Jpsiee001.C
+++ b/MC/CustomGenerators/PWGDQ/Hijing_Jpsiee001.C
@@ -1,11 +1,10 @@
 AliGenerator *
 GeneratorCustom()
 {
-
   TString simulation = gSystem->Getenv("CONFIG_SIMULATION");
     
-  AliGenCocktail *ctl = GeneratorCocktail("Hijing_Jpsiee001");
-
+  AliGenCocktail *ctl =  (AliGenCocktail*) GeneratorCocktail("Hijing_Jpsiee001");
+  
   if(!simulation.Contains("Embed")){
     AliGenerator *hij = GeneratorHijing();
     ctl->AddGenerator(hij, "Hijing", 1.);
diff --git a/MC/CustomGenerators/PWGDQ/Hijing_Jpsiee002.C b/MC/CustomGenerators/PWGDQ/Hijing_Jpsiee002.C
index 9a492ce9..65ea11b3 100644
--- a/MC/CustomGenerators/PWGDQ/Hijing_Jpsiee002.C
+++ b/MC/CustomGenerators/PWGDQ/Hijing_Jpsiee002.C
@@ -3,8 +3,8 @@ GeneratorCustom(TString ptParamPrompt="UserParam_PbPb5TeV_0010")
 {
   TString simulation = gSystem->Getenv("CONFIG_SIMULATION");
     
-  AliGenCocktail *ctl = GeneratorCocktail("Hijing_Jpsiee002");
-
+  AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_Jpsiee002");
+  
   if(!simulation.Contains("Embed")){
     AliGenerator *hij = GeneratorHijing();
     ctl->AddGenerator(hij, "Hijing", 1.);
diff --git a/MC/CustomGenerators/PWGDQ/Hijing_JpsieeXeXe.C b/MC/CustomGenerators/PWGDQ/Hijing_JpsieeXeXe.C
index 11bd7595..46781228 100644
--- a/MC/CustomGenerators/PWGDQ/Hijing_JpsieeXeXe.C
+++ b/MC/CustomGenerators/PWGDQ/Hijing_JpsieeXeXe.C
@@ -1,7 +1,8 @@
 AliGenerator *
 GeneratorCustom()
 {
-  AliGenCocktail *cocktail   = GeneratorCocktail("Hijing_JpsieeXeXe");
+  AliGenCocktail *cocktail = (AliGenCocktail*) GeneratorCocktail("Hijing_JpsieeXeXe");
+
   AliGenerator   *hij   = GeneratorHijing();
   cocktail->AddGenerator(hij,  "Hijing", 1.);    
   if (uidConfig % 10 < 7) {
@@ -16,5 +17,6 @@ GeneratorCustom()
     TFile *file = new TFile("typeHF_5.proc", "recreate");
     file->Close();
   }
+  
   return cocktail;
 }
diff --git a/MC/CustomGenerators/PWGDQ/Hijing_LMee001.C b/MC/CustomGenerators/PWGDQ/Hijing_LMee001.C
index eaef737e..b1118794 100644
--- a/MC/CustomGenerators/PWGDQ/Hijing_LMee001.C
+++ b/MC/CustomGenerators/PWGDQ/Hijing_LMee001.C
@@ -7,7 +7,7 @@ GeneratorCustom(TString opt = "")
   gSystem->Load("libEvtGenExternal");
   gSystem->Load("libTEvtGen");
  
-  AliGenCocktail* ctl   = (AliGenCocktail*) GeneratorCocktail("Hijing_LMee001");
+  AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_LMee001");
 
   // Background events: HIJING (only if non-embedded)
   TString simulation = gSystem->Getenv("CONFIG_SIMULATION");
diff --git a/MC/CustomGenerators/PWGDQ/Hijing_LMee002.C b/MC/CustomGenerators/PWGDQ/Hijing_LMee002.C
index 32741303..a9a31fc7 100644
--- a/MC/CustomGenerators/PWGDQ/Hijing_LMee002.C
+++ b/MC/CustomGenerators/PWGDQ/Hijing_LMee002.C
@@ -1,8 +1,7 @@
 AliGenerator *
 GeneratorCustom(TString opt = "")
 {
-
-  AliGenCocktail* ctl   = (AliGenCocktail*) GeneratorCocktail("Hijing_LMee002");
+  AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_LMee002");
 
   // Background events: HIJING (only if non-embedded)
   TString simulation = gSystem->Getenv("CONFIG_SIMULATION");
diff --git a/MC/CustomGenerators/PWGDQ/Hijing_LMee003.C b/MC/CustomGenerators/PWGDQ/Hijing_LMee003.C
index b054ed89..2e71d5f2 100644
--- a/MC/CustomGenerators/PWGDQ/Hijing_LMee003.C
+++ b/MC/CustomGenerators/PWGDQ/Hijing_LMee003.C
@@ -1,8 +1,7 @@
 AliGenerator *
 GeneratorCustom(TString opt = "")
 {
-
-  AliGenCocktail *ctl   = (AliGenCocktail*)GeneratorCocktail("Hijing_LMee003");
+  AliGenCocktail *ctl = (AliGenCocktail*) GeneratorCocktail("Hijing_LMee003");
 
   // Background events: HIJING (only if non-embedded)
   TString simulation = gSystem->Getenv("CONFIG_SIMULATION");
diff --git a/MC/CustomGenerators/PWGDQ/Hijing_Starlight.C b/MC/CustomGenerators/PWGDQ/Hijing_Starlight.C
index e4427886..6afc94e3 100644
--- a/MC/CustomGenerators/PWGDQ/Hijing_Starlight.C
+++ b/MC/CustomGenerators/PWGDQ/Hijing_Starlight.C
@@ -1,8 +1,8 @@
 AliGenerator *
 GeneratorCustom()
 {
-  AliGenCocktail* cocktail = GeneratorCocktail("Hijing_Starlight");
-  
+  AliGenCocktail *cocktail = (AliGenCocktail*) GeneratorCocktail("Hijing_Starlight");
+
   AliGenerator* starlight = GeneratorStarlight();
   if (processConfig == TString("kTwoGammaToElMedium")) {
      AliGenStarLight *genStarLight = (AliGenStarLight*) starlight;
diff --git a/MC/GeneratorConfig.C b/MC/GeneratorConfig.C
index c6c4d57f..8015ea6c 100644
--- a/MC/GeneratorConfig.C
+++ b/MC/GeneratorConfig.C
@@ -9,6 +9,12 @@
 #include "AliDecayer.h"
 #endif
 
+#if !defined(__CINT__) || defined(__MAKECINT__)
+R__ADD_INCLUDE_PATH($ALIDPG_ROOT)
+#include "MC/CustomGenerators/PWGDQ/GenJPsiParaSet.C"
+#endif
+
+
 enum EGenerator_t {
   kGeneratorDefault,
   // Pythia6
@@ -1596,13 +1602,12 @@ Generator_Jpsiee(const Char_t *params, Float_t jpsifrac, Float_t lowfrac, Float_
   AliGenParam* jpsi    = NULL;
   if(stringParams.Contains("UserParam")){ 
    // use private parametrization for y / pT instead of AliGenMUONlib
+#if defined(__CINT__)
+    // for root5
    gROOT->LoadMacro("$ALIDPG_ROOT/MC/CustomGenerators/PWGDQ/GenJPsiParaSet.C++");
-#if !(defined(__CLING__))
-   jpsi = GenJPsiParaSet(stringParams);
-#else
-   Printf("ERROR: This option is not yet available for ROOT6 ... abort");
-   return NULL;
 #endif
+
+   jpsi = GenJPsiParaSet(stringParams);
   }
   else jpsi = new AliGenParam(1, AliGenMUONlib::kJpsi, params, "Jpsi");
   jpsi->SetPtRange(0., 1000.);