diff --git a/atom b/atom
index d962645..fad28d1 100755
--- a/atom
+++ b/atom
@@ -252,7 +252,7 @@ Select() {
 		then
 			where_statement+=( "$key is NULL" )
 		else
-			where_statement+=( "$key='$value'" )
+			where_statement+=( "$key="'"'"${value//\"/\\\"}"'"' )
 		fi
 	done
 	echo	"SELECT IFNULL("				\
@@ -327,7 +327,7 @@ Update(){
 				what=value
 			;;
 			value)
-				set_statement="${set_statement}='$argument'"
+				set_statement="${set_statement}="'"'"${value//\"/\\\"}"'"'
 				what=key
 			;;
 		esac
@@ -339,7 +339,7 @@ Update(){
 		then
 			where_statement+=( "$key is NULL" )
 		else
-			where_statement+=( "$key='$value'" )
+			where_statement+=( "$key="'"'"${value//\"/\\\"}"'"' )
 		fi
 	done
 	echo	"UPDATE '$table' SET"		\