diff --git a/src/tomb b/src/tomb
index ad8a31b..b9d250e 100755
--- a/src/tomb
+++ b/src/tomb
@@ -336,7 +336,7 @@ EOF
 }
 
 create_tomb() {
-    if [[ `check_swap out` == 1 && `option_is_set "--ignore-swap" out` == 'set' ]]; then
+    if ! option_is_set --ignore-swap && [[ `check_swap out` == 1 ]]; then
         error "You have swap activated; use --ignore-swap if you want to skip this check"
         act "Using encryption with swap activated is very bad, because some files, or even your secret key, could be written on hard disk."
         act "However, it could be that your swap is encrypted. If this is case, this is ok. Then, use --ignore-swap to skip this check"
@@ -505,7 +505,7 @@ create_tomb() {
 
 mount_tomb() {
     notice "Commanded to open tomb $CMD2"
-    if [[ `check_swap out` == 1 && `option_is_set "--ignore-swap" out` == 'set' ]]; then
+    if ! option_is_set --ignore-swap && [[ `check_swap out` == 1 ]]; then
         error "You have swap activated; use --ignore-swap if you want to skip this check"
         act "Using encryption with swap activated is very bad, because some files, or even your secret key, could be written on hard disk."
         act "However, it could be that your swap is encrypted. If this is case, this is ok. Then, use --ignore-swap to skip this check"