Fixed bug under certain compilers
Fixed crash due to a kernel's arguments having changed