diff --git a/src/expressionParser/ExpressionParser.cc b/src/expressionParser/ExpressionParser.cc
index 4992f38..c0a33dd 100644
--- a/src/expressionParser/ExpressionParser.cc
+++ b/src/expressionParser/ExpressionParser.cc
@@ -28,7 +28,7 @@ std::string ExpressionParser::parse(const std::string& str, AMDA::helpers::Prope
 
 	if(!result || iter != end)
 	{
-		LOG4CXX_ERROR(gLogger, "ExpressionParser::parse - Cannot parse the expression")
+		LOG4CXX_ERROR(gLogger, "ExpressionParser::parse - Cannot parse the expression at -> " << std::string(iter + 1, str.end()))
 		return "";
 	}
 
diff --git a/test/parser/amda_parser_cdpp3.csv b/test/parser/amda_parser_cdpp3.csv
index b83452d..6d17172 100644
--- a/test/parser/amda_parser_cdpp3.csv
+++ b/test/parser/amda_parser_cdpp3.csv
@@ -20,30 +20,30 @@ cass_b_krtp(1)-1/cass_r_sat^3*21153*sin(@pi/2-cass_lat_sat*@pi/180)+3/2/cass_r_s
 cass_b_krtp(0)-2/cass_r_sat^3*21153*cos(@pi/2-cass_lat_sat*@pi/180)+3/cass_r_sat^4*1576*3/2*((cos(@pi/2-cass_lat_sat*@pi/180))^2-1/3)+4/cass_r_sat^5*2267*5/2*cos(@pi/2-cass_lat_sat*@pi/180)*((cos(@pi/2-cass_lat_sat*@pi/180))^2-9/15);
 ((sat_sw_pdyn-0.1)>0)=1;((($sat_sw_pdyn-0.1)>0)==1)
 mes_bmag_orb1m-shiftT_(mes_bmag_orb,300);"($mes_bmag_orb1m-#timeShift($mes_bmag_orb;300))"
-shiftT_(mes_bmag_orb,300);
+shiftT_(mes_bmag_orb,300);"#timeShift($mes_bmag_orb;300)"
 mes_b_orbmso1m(0)*shiftT_(mes_b_orbmso1m(0),300)<0 & mes_xyz_orbmso(0)<0 & mes_fips_scanprot(10)>100000 & mes_mercury_r<3;
-mes_bmag_orb1s-mean_sm_(mes_bmag_orb,120);
-mes_fips_scanprot(3);
-shiftT_(mes_bmag_orb1s,180);
-mes_bmag_orb1s-shiftT_(mes_bmag_orb1s,180);
-1e-15*omni5_sw_v_gse*(omni5_imf(1)*omni5_imf(1)+omni5_imf(2)*omni5_imf(2))/@mu_0;
-(@pi/2)-(atan(imf_gsm(2)/abs(imf_gsm(1))));
-sw_n*9.1e-31*sw_vb*sw_vb*1e15*1e9;
+mes_bmag_orb1s-mean_sm_(mes_bmag_orb,120);"($mes_bmag_orb1s-#sliding_average($mes_bmag_orb;120))"
+mes_fips_scanprot(3);$mes_fips_scanprot[3]
+shiftT_(mes_bmag_orb1s,180);"#timeShift($mes_bmag_orb1s;180)"
+mes_bmag_orb1s-shiftT_(mes_bmag_orb1s,180);"($mes_bmag_orb1s-#timeShift($mes_bmag_orb1s;180))"
+1e-15*omni5_sw_vgse*(omni5_imf(1)*omni5_imf(1)+omni5_imf(2)*omni5_imf(2))/@mu_0;
+(@pi/2)-(atan(imf_gsm(2)/abs(imf_gsm(1))));((3.14159/2)-atan(($imf_gsm[2]/abs($imf_gsm[1]))))
+sw_n*9.1e-31*sw_vb*sw_vb*1e15*1e9;((((($sw_n*(9.1e-31))*$sw_vb)*$sw_vb)*(1e15))*(1e9))
 (10.22+1.29*tanh(0.184*(imf_gsm(2)+8.14))*sw_n*9.1e-31*sw_vb*sw_vb*1e15*1e9^(-1/6.6))*2^(0.58-0.007*imf_gsm(2))*(1+0.024*alog10(sw_n*9.1e-31*sw_vb*sw_vb*1e15*1e9));
 1e-6*sw_vb*imf_mag^2*(sin((@pi/2)-(atan(imf_gsm(2)/abs(imf_gsm(1))))/2))^4*(6380*1000*(10.22+1.29*tanh(0.184*(imf_gsm(2)+8.14))*ws_pressiondyn^(-1/6.6))*2^(0.58-0.007*imf_gsm(2))*(1+0.024*alog10(ws_pressiondyn)))^2;
--atan(omni5_imf(0)/omni5_imf(2))*180/@pi;
-pcn/pcs;
+-atan(omni5_imf(0)/omni5_imf(2))*180/@pi;(-atan(($omni5_imf[0]/$omni5_imf[2]))*(180/3.14159))
+pcn/pcs;($pcn/$pcs)
 ((sw_vb*1e-3)^(4/3))*((1e-9*imf_mag)^(2/3))*((sin(((@pi/2)-(atan(imf_gsm(2)/abs(imf_gsm(1)))))/2))^(8/3))*@pi*(7*6380*1000)^2;
 (1e-6)*sw_vb*(imf_mag^2)*((sin((@pi/2)-(atan(imf_gsm(2)/abs(imf_gsm(1))))/2))^4)*@pi*(7*6380*1000)^2;
-c1_b_gse_gsm(2);
-ds1_b_gsm(2);
-abs(omni5_sw_e);
+c1_b_gse(2);
+ds1_b_gsm(2);$ds1_b_gsm[2]
+abs(omni5_sw_e);abs($omni5_sw_e)
 wsd_Ne_B*wsd_Te_B;
 wsd_Ne_B/abs(omni5_sw_e);
 wsd_Te_A;
 wsd_Ne_A;
-1.e6*(1./ros_cg_r)^2;
-sqrt(ros_sc_xyz(0)^2+ros_sc_xyz(1)^2+ros_sc_xyz(2)^2);
+1.e6*(1./ros_cg_r)^2;((1.e6)*pow((1./$ros_cg_r),2))
+sqrt(ros_sc_xyz(0)^2+ros_sc_xyz(1)^2+ros_sc_xyz(2)^2);sqrt(((pow($ros_sc_xyz[0],2)+pow($ros_sc_xyz[1],2))+pow($ros_sc_xyz[2],2)))
 c1_hia_vtot/ws_c_ms;
 c1_hia_dens*1.d6*c1_hia_v(0)*1.d3;
 c1_whi_ne*1.d6*c1_hia_v(0)*1.d3;
@@ -57,9 +57,9 @@ c1_whi_ne*1.d6*c1_hia_v(0)*1.d3;
 sqrt(2*@k*c1_hia_t*@eV2K/@m_p)/1000;
 sqrt(ros_ob_20hz(0)+14*ros_ob_20hz(0)+14+ros_ob_20hz(1)+15*ros_ob_20hz(1)+15+ros_ob_20hz(2)*ros_ob_20hz(2));
 sqrt(ros_ob_20hz(0)+14*ros_ob_20hz(0)+14+ros_ob_20hz(1)+15*ros_ob_20hz(1)+15+ros_ob_20hz(2)*ros_ob_20hz(2));
-ros_ob_20hz(2);
-ros_ob_20hz(0)+14;
-ros_ob_20hz(1)+15;
+ros_ob_20hz(2);$ros_ob_20hz[2]
+ros_ob_20hz(0)+14;($ros_ob_20hz[0]+14)
+ros_ob_20hz(1)+15;($ros_ob_20hz[1]+15)
 sqrt(2.d0*@k*(c1_hia_t*@eV2K)/@m_p)/1.d3;
 c1_b_gsetot*1.d-9/sqrt(@mu_0*c1_hia_dens*1.d6*@m_p)/1.d3;
 b_sws10_mag/sqrt(@mu_0*rho_sws10);
@@ -72,13 +72,13 @@ lep_g(4)/(b_g(3)/sqrt(@mu_0*lep_g(0)));
 (c1_h_dens*1.e6*@q_e*(c1_h_t(0)+c1_h_t(1))/2)*1.e9;
 c1_h_dens*1.e6*@q_e*(c1_h_t(0)+c1_h_t(1))/2/((c1_b_gsetot*1.e-9)^2/(4*3.14*1.e-7));
 c1_h_dens*1.e6*(c1_h_t(0)-c1_h_t(1))*@q_e*1.e18*@mu_0/c1_b_gsetot^2;
-@rad2deg*acos(imf_gsm(2)/imf_mag);
-@rad2deg*acos( imf_gsm(0)/sqrt( imf_gsm(0)*imf_gsm(0) +imf_gsm(1)*imf_gsm(1) ) );
-sw_n*sw_vb*sw_vb*0.00000167;
-@rad2deg*acos(omni5_imf(2)/omni5_imf_mag) ;
-@rad2deg*acos( omni5_imf(0)/sqrt( omni5_imf(0)*omni5_imf(0) +omni5_imf(1)*omni5_imf(1) ) );
-c4_h_t(1)/c4_h_t(0);
-c3_hia_tperp/c3_hia_tpar;
+@rad2deg*acos(imf_gsm(2)/imf_mag);(57.2958*acos(($imf_gsm[2]/$imf_mag)))
+@rad2deg*acos( imf_gsm(0)/sqrt( imf_gsm(0)*imf_gsm(0) +imf_gsm(1)*imf_gsm(1) ) );(57.2958*acos(($imf_gsm[0]/sqrt((($imf_gsm[0]*$imf_gsm[0])+($imf_gsm[1]*$imf_gsm[1]))))))
+sw_n*sw_vb*sw_vb*0.00000167;((($sw_n*$sw_vb)*$sw_vb)*0.00000167)
+@rad2deg*acos(omni5_imf(2)/omni5_imf_mag) ;(57.2958*acos(($omni5_imf[2]/$omni5_imf_mag)))
+@rad2deg*acos( omni5_imf(0)/sqrt( omni5_imf(0)*omni5_imf(0) +omni5_imf(1)*omni5_imf(1) ) );(57.2958*acos(($omni5_imf[0]/sqrt((($omni5_imf[0]*$omni5_imf[0])+($omni5_imf[1]*$omni5_imf[1]))))))
+c4_h_t(1)/c4_h_t(0);($c4_h_t[1]/$c4_h_t[0])
+c3_hia_tperp/c3_hia_tpar;($c3_hia_tperp/$c3_hia_tpar)
 sqrt( ( c3_xyz_gse(0)-c4_xyz_gse(0) )^2 +  ( c3_xyz_gse(1)-c4_xyz_gse(1) )^2 +  ( c3_xyz_gse(2)-c4_xyz_gse(2) )^2)*@Re*0.001;
 sqrt((5/3*c1_hia_t*@q_e)/@m_p)/1000;
 c1_btot/sqrt(@m_p*@mu_0*c1_hia_dens*1000000);
--
libgit2 0.21.2