diff --git a/max_memory_limit_mysql.sh b/max_memory_limit_mysql.sh
index 5585786..d47a1e5 100755
--- a/max_memory_limit_mysql.sh
+++ b/max_memory_limit_mysql.sh
@@ -22,6 +22,12 @@ fi
 [[ -n "$mysql_credential_args" ]] || mysql_credential_args="$DEFAULT_MYSQL_CREDENTIAL_ARGS"
 [[ -n "$basename_mysql_daemon" ]] || basename_mysql_daemon="$DEFAULT_BASENAME_MYSQL_DEAMON"
 
+if [[ -z "$(ps ax | grep $basename_mysql_daemon | grep -v grep)" ]] ; then
+   if [[ "$basename_mysql_daemon" = "mysqld" ]] ; then
+      basename_mysql_daemon="mariadb"
+   fi
+fi
+
 
 declare -i key_buffer_size
 declare -i query_cache_size
@@ -290,7 +296,8 @@ max_memory_allocated=`expr $key_buffer_size \
 max_memory_allocated_mb=`expr $max_memory_allocated / 1024 / 1024`
 
 
-cur_memory_usage=`ps -ylC $basename_mysql_daemon | grep $basename_mysql_daemon | awk '{print$8}'`
+#cur_memory_usage=`ps -ylC $basename_mysql_daemon | grep $basename_mysql_daemon | awk '{print$8}'`
+cur_memory_usage=$(ps aux | egrep $basename_mysql_daemon | grep -v grep | grep $basename_mysql_daemon | awk '{print$6}')
 cur_memory_usage_mb=`echo "scale=0; $cur_memory_usage/1024+1" | bc -l`
 
 
@@ -325,7 +332,7 @@ echo "----- Current Status"
 echo ""
 echo -e "\tMySQL Version.....................: $mysql_version ($mysql_version_compile_machine)"
 echo ""
-if [ $cur_memory_usage_mb -gt 1023 ]; then
+if [[ $cur_memory_usage_mb -gt 1023 ]]; then
    cur_memory_usage_gb=`echo "scale=3; $cur_memory_usage_mb/1024" | bc -l`
    echo -e "\tCurrent Memory Usage..............: $cur_memory_usage_mb MB ($cur_memory_usage_gb GB)"
 else