diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index a84b98a3888945c666a9c8d4fd275814d50dc6ad..59f6545a5cc83d3c7306e3ec60b095215da700a3 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -609,12 +609,12 @@ if(PKG_USER-INTEL)
     if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "2016")
       message(FATAL_ERROR "USER-INTEL is needed at least 2016 intel compiler")
     endif()
-    if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "2017.3")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHost")
-    else()
+    if(CMAKE_CXX_COMPILER_VERSION MATCHES "^2017\.[34].*")
       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xCOMMON-AVX512")
+    else()
+      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHost")
     endif()
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qopenmp -qno-offload -fno-alias -ansi-alias -restrict -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG-O2 -fp-model fast=2 -no-prec-div -qoverride-limits -qopt-zmm-usage=high") 
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qopenmp -qno-offload -fno-alias -ansi-alias -restrict -DLMP_INTEL_USELRT -DLMP_USE_MKL_RNG -O2 -fp-model fast=2 -no-prec-div -qoverride-limits -qopt-zmm-usage=high")
     set(USER-INTEL_SOURCES_DIR ${LAMMPS_SOURCE_DIR}/USER-INTEL)
     set(USER-INTEL_SOURCES ${USER-INTEL_SOURCES_DIR}/intel_preprocess.h
                            ${USER-INTEL_SOURCES_DIR}/intel_buffers.h