diff --git a/manifests/adopt.pp b/manifests/adopt.pp
index 26283b0..0d29f95 100644
--- a/manifests/adopt.pp
+++ b/manifests/adopt.pp
@@ -172,6 +172,7 @@ define java::adopt (
 
   } else {
     $_version = $version
+    $_version_int = Numeric($_version)
     # use default versions if no specific major and minor version parameters are provided
     case $version {
       '8' : {
@@ -276,7 +277,7 @@ define java::adopt (
   # jre just replaces jdk with jre in the archive name, but not in the path name!
   # https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz
 
-  if ( "${_version}" == '8' ) {
+  if ( $_version_int == 8 ) {
     $_release_minor_package_name = $release_minor
   } else {
     $_release_minor_package_name = "_${release_minor}"
@@ -293,7 +294,7 @@ define java::adopt (
 
   # naming convention changed after major version 8, setting variables to consider that
   # download_folder_prefix always begins with "jdk", even for jre! see comments for package_name above
-  if ( "${_version}" == '8' ) {
+  if ( $_version_int == 8 ) {
     $spacer = '-'
     $download_folder_prefix = 'jdk'
   } else {
diff --git a/spec/defines/adopt_spec.rb b/spec/defines/adopt_spec.rb
index 900d9d1..4cb01d3 100644
--- a/spec/defines/adopt_spec.rb
+++ b/spec/defines/adopt_spec.rb
@@ -49,7 +49,6 @@ describe 'java::adopt', type: :define do
       it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz]') }
     end
 
-
     context 'when AdoptOpenJDK Java 8 JRE' do
       let(:params) { { ensure: 'present', version: '8', java: 'jre' } }
       let(:title) { 'jre8' }
@@ -249,10 +248,10 @@ describe 'java::adopt', type: :define do
     context 'when installing multiple versions' do
       let(:params) do
         {
-            ensure: 'present',
-            version_major: '8u202',
-            version_minor: 'b08',
-            java: 'jdk',
+          ensure: 'present',
+          version_major: '8u202',
+          version_minor: 'b08',
+          java: 'jdk',
         }
       end
       let(:title) { 'jdk8' }
@@ -271,7 +270,6 @@ describe 'java::adopt', type: :define do
 
       it { is_expected.to compile }
     end
-
   end
   describe 'incompatible OSes' do
     [