diff --git a/src/main.c b/src/main.c
index 54bf352..9840eca 100644
--- a/src/main.c
+++ b/src/main.c
@@ -530,8 +530,8 @@ int main(void)
 	fxp_t IGAIN_CV = fxp_from_float(    1.000f);
 	fxp_t IERR_LIMIT = fxp_from_int(1000);
 
-	fxp_t PGAIN_CC = fxp_from_float( 50.000f);
-	fxp_t IGAIN_CC = fxp_from_float(  0.300f);
+	fxp_t PGAIN_CC = fxp_from_float(500.000f);
+	fxp_t IGAIN_CC = fxp_from_float(  1.000f);
 
 	fxp_t CURRENT_THRESHOLD = fxp_from_float(0.001f);
 
@@ -765,6 +765,10 @@ int main(void)
 					break;
 
 				case ConvConstCurrent:
+					if(time_in_state == 0) {
+						iErr = 0;
+					}
+
 					// bootstrap off
 					timer_set_oc_value(TIM1, TIM_CH_BOOTSTRAP, 0);