diff --git a/Src/DS_Encoder.c b/Src/DS_Encoder.c
index bf07603..c445122 100644
--- a/Src/DS_Encoder.c
+++ b/Src/DS_Encoder.c
@@ -4,7 +4,7 @@ void DS_EncoderInitTim(DS_Encoder *Encoder, TIM_HandleTypeDef *hTim)
 {
     Encoder->hTim = hTim;
     Encoder->State = 0;
-    HAL_TIM_Base_Start(hTim);
+    HAL_TIM_Encoder_Start(hTim, TIM_CHANNEL_ALL);
 
 }
 
@@ -80,7 +80,7 @@ int8_t DS_EncoderGetState(DS_Encoder *Encoder)
 {
     if (Encoder->hTim != 0)
     {
-        int8_t CurrentCounter = Encoder->hTim->Instance->CNT / 4;
+        int8_t CurrentCounter = ((int16_t)Encoder->hTim->Instance->CNT) / 4;
         int8_t  ValueToReturn = CurrentCounter - Encoder->State;
         Encoder->State = CurrentCounter;