diff --git a/cpu-miner.c b/cpu-miner.c
index c74d8c5..33650c9 100644
--- a/cpu-miner.c
+++ b/cpu-miner.c
@@ -2912,10 +2912,10 @@ int main(int argc, char *argv[])
         {
            exit(1);
         }
-*/
+
         if ( !check_cpu_capability() )
            exit(1);
-
+*/
         if ( opt_algo == ALGO_NULL )
         {
             fprintf(stderr, "%s: no algo supplied\n", argv[0]);
@@ -2963,6 +2963,9 @@ int main(int argc, char *argv[])
         if ( !register_algo_gate( opt_algo, &algo_gate ) )
            exit(1);
 
+        if ( !check_cpu_capability() )
+           exit(1);
+
 	pthread_mutex_init(&stats_lock, NULL);
 	pthread_mutex_init(&g_work_lock, NULL);
 	pthread_mutex_init(&rpc2_job_lock, NULL);