diff --git a/xmrstak/backend/amd/amd_gpu/gpu.cpp b/xmrstak/backend/amd/amd_gpu/gpu.cpp
index b3d36e70446d2e0c74bd52c8562b90a7162eb87c..03100d0a3bbcff1003d433c84daf0eb2c97a8c6f 100644
--- a/xmrstak/backend/amd/amd_gpu/gpu.cpp
+++ b/xmrstak/backend/amd/amd_gpu/gpu.cpp
@@ -1101,7 +1101,7 @@ size_t XMRSetJob(GpuContext* ctx, uint8_t* input, size_t input_len, uint64_t tar
 size_t XMRRunJob(GpuContext* ctx, cl_uint* HashOutput, xmrstak_algo miner_algo)
 {
 	// switch to the kernel storage
-	int kernel_storage = ::jconf::inst()->GetCurrentCoinSelection().GetDescription(1).GetMiningAlgo() ? 0 : 1;
+	int kernel_storage = miner_algo == ::jconf::inst()->GetCurrentCoinSelection().GetDescription(1).GetMiningAlgo() ? 0 : 1;
 	
 	cl_int ret;
 	cl_uint zero = 0;
diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp
index 3f55eba92ab33b0d3ae87bb414cdcfa11e5ecab3..2add3db271c34effa7d037fa6b8b8fee31bdb2bd 100644
--- a/xmrstak/jconf.cpp
+++ b/xmrstak/jconf.cpp
@@ -88,22 +88,22 @@ constexpr size_t iConfigCnt = (sizeof(oConfigValues)/sizeof(oConfigValues[0]));
 
 xmrstak::coin_selection coins[] = {
 	// name, userpool, devpool, default_pool_suggestion
-	{ "aeon7",            {cryptonight_aeon, cryptonight_lite, 7u}, {cryptonight_aeon, cryptonight_lite, 7u}, "mine.aeon-pool.com:5555" },
-	{ "croat",            {cryptonight, cryptonight, 0u},           {cryptonight, cryptonight, 0u},            nullptr },
-	{ "cryptonight",      {cryptonight, cryptonight, 0u},           {cryptonight, cryptonight, 0u},            nullptr },
-	{ "cryptonight_lite", {cryptonight_lite, cryptonight_lite, 0u}, {cryptonight_lite, cryptonight_lite, 0u},  nullptr },
-	{ "edollar",          {cryptonight, cryptonight, 0u},           {cryptonight, cryptonight, 0u},            nullptr },
-	{ "electroneum",      {cryptonight, cryptonight, 0u},           {cryptonight, cryptonight, 0u},            nullptr },
-	{ "graft",            {cryptonight_monero, cryptonight, 8u},    {cryptonight_monero, cryptonight, 7u},     nullptr },
-	{ "haven",            {cryptonight_heavy, cryptonight, 2u},     {cryptonight_heavy, cryptonight, 3u},      nullptr },
-	{ "intense",          {cryptonight, cryptonight, 0u},           {cryptonight, cryptonight, 0u},            nullptr },
-	{ "karbo",            {cryptonight, cryptonight, 0u},           {cryptonight, cryptonight, 0u},            nullptr },
-	{ "monero7",          {cryptonight_monero, cryptonight, 7u},    {cryptonight_monero, cryptonight, 7u},     "pool.usxmrpool.com:3333" },
-	{ "stellite",         {cryptonight_monero, cryptonight, 3u},    {cryptonight_monero, cryptonight, 7u},     nullptr },
-	{ "cryptonight_heavy", cryptonight_heavy, cryptonight_heavy, 0u, nullptr },
-	{ "sumokoin",         {cryptonight_heavy, cryptonight, 3u},     {cryptonight_heavy, cryptonight, 3u},      nullptr }
-	{ "cryptonight_lite_v7", cryptonight_aeon, cryptonight_aeon, 0u, nullptr },
-	{ "cryptonight_v7", cryptonight_monero, cryptonight_monero, 0u, nullptr },
+	{ "aeon7",               {cryptonight_aeon, cryptonight_lite, 7u},     {cryptonight_aeon, cryptonight_lite, 7u},    "mine.aeon-pool.com:5555" },
+	{ "croat",               {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
+	{ "cryptonight",         {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
+	{ "cryptonight_heavy",   {cryptonight_heavy, cryptonight_heavy, 0u},   {cryptonight_heavy, cryptonight_heavy, 0u},   nullptr },
+	{ "cryptonight_lite",    {cryptonight_aeon, cryptonight_lite, 255u},   {cryptonight_aeon, cryptonight_lite, 7u},     nullptr },
+	{ "cryptonight_lite_v7", {cryptonight_lite, cryptonight_aeon, 255u},   {cryptonight_aeon, cryptonight_lite, 7u},     nullptr },
+	{ "cryptonight_v7",      {cryptonight_monero, cryptonight_monero, 0u}, {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
+	{ "edollar",             {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
+	{ "electroneum",         {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
+	{ "graft",               {cryptonight_monero, cryptonight, 8u},        {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
+	{ "haven",               {cryptonight_heavy, cryptonight, 2u},         {cryptonight_heavy, cryptonight_heavy, 0u},   nullptr },
+	{ "intense",             {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
+	{ "karbo",               {cryptonight_monero, cryptonight, 255u},      {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
+	{ "monero7",             {cryptonight_monero, cryptonight_monero, 0u}, {cryptonight_monero, cryptonight_monero, 0u}, "pool.usxmrpool.com:3333" },
+	{ "stellite",            {cryptonight_monero, cryptonight, 3u},        {cryptonight_monero, cryptonight_monero, 0u}, nullptr },
+	{ "sumokoin",            {cryptonight_heavy, cryptonight_heavy, 0u},   {cryptonight_heavy, cryptonight_heavy, 0u},   nullptr }
 };
 
 constexpr size_t coin_alogo_size = (sizeof(coins)/sizeof(coins[0]));