diff --git a/src/Cli/Cli.csproj b/src/Cli/Cli.csproj
index 60dd655..188e877 100644
--- a/src/Cli/Cli.csproj
+++ b/src/Cli/Cli.csproj
@@ -9,7 +9,7 @@
         <PackageId>Novaloop.UpdateTag</PackageId>
         <title>Updates the tag of a repo to the next chosen version according the semver symantic.</title>
         <PackageTags>semver;update-tag;tag;git</PackageTags>
-        <Version>0.1.7</Version>
+        <Version>0.2.1</Version>
         <Authors>Matthias Langhard</Authors>
         <Company>Novaloop AG</Company>
         <PackageProjectUrl>https://gitlab.com/novaloop-oss/novaloop.update-tag</PackageProjectUrl>
diff --git a/src/Core/Queries/GetVersionInformationFromRepo.cs b/src/Core/Queries/GetVersionInformationFromRepo.cs
index beb5d95..74821b6 100644
--- a/src/Core/Queries/GetVersionInformationFromRepo.cs
+++ b/src/Core/Queries/GetVersionInformationFromRepo.cs
@@ -1,12 +1,14 @@
 using System;
 using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
 using Application.Interfaces;
 using Application.Models;
 using MediatR;
 
 namespace Application.Queries
 {
-    public class GetVersionInformationFromRepo : RequestHandler<GetVersionInformationFromRepo.Query, VersionInformation>
+    public class GetVersionInformationFromRepo : IRequestHandler<GetVersionInformationFromRepo.Query, VersionInformation>
     {
         public class Query : IRequest<VersionInformation>
         {
@@ -27,7 +29,7 @@ namespace Application.Queries
             _gitRepoReadService = gitRepoReadService;
         }
 
-        protected override VersionInformation Handle(Query request)
+        public async Task<VersionInformation> Handle(Query request, CancellationToken cancellationToken)
         {
             var versions = _gitRepoReadService
                 .GetAllVersions(request.RepositoryPath);
@@ -42,10 +44,11 @@ namespace Application.Queries
                 .OrderByDescending(v => v.Major)
                 .ThenByDescending(v => v.Minor)
                 .ThenByDescending(v => v.Patch)
+                .ThenByDescending(v => v.Rc == null)
                 .ThenByDescending(v => v.Rc)
                 .FirstOrDefault();
 
-            return currentVersion == null ? null : new VersionInformation(currentVersion);
+            return await Task.FromResult(currentVersion == null ? null : new VersionInformation(currentVersion));
         }
     }
 }
\ No newline at end of file
diff --git a/tests/update-tag.tests/GetVersionInformationFromRepoTests.cs b/tests/update-tag.tests/GetVersionInformationFromRepoTests.cs
new file mode 100644
index 0000000..c2e661e
--- /dev/null
+++ b/tests/update-tag.tests/GetVersionInformationFromRepoTests.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+using System.Threading;
+using Application.Interfaces;
+using Application.Models;
+using Application.Queries;
+using Moq;
+using Xunit;
+
+namespace UpdateTag.Tests
+{
+    public class GetVersionInformationFromRepoTests
+    {
+        [Fact]
+        public async void DoesReadCurrentVersionCorrectly()
+        {
+            // Arrange
+            var mockedVersionList = new List<Version>
+            {
+                new Version(0, 1, 5),
+                new Version(0, 1, 7),
+                new Version(0, 2, 0),
+                new Version(0, 2, 0, 0),
+                new Version(0, 2, 0, 1),
+                new Version(0, 2, 0, 2)
+            };
+            var gitRepoMock = new Mock<IGitRepoReadService>();
+            gitRepoMock.Setup(m => m.GetAllVersions(It.IsAny<string>()))
+                .Returns(mockedVersionList);
+            var handler = new GetVersionInformationFromRepo(gitRepoMock.Object);
+            var query = new GetVersionInformationFromRepo.Query("");
+
+            // Act
+            var versionInformation = await handler.Handle(query, CancellationToken.None);
+
+            // Assert
+            Assert.Equal("0.2.0", versionInformation.CurrentVersion.ToString());
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/update-tag.tests/update-tag.tests.csproj b/tests/update-tag.tests/update-tag.tests.csproj
index ff64426..55071d9 100644
--- a/tests/update-tag.tests/update-tag.tests.csproj
+++ b/tests/update-tag.tests/update-tag.tests.csproj
@@ -9,6 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
+    <PackageReference Include="Moq" Version="4.16.1" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>