diff --git a/chch-status.sh b/chch-status.sh
index 095869f..0f3d0b6 100755
--- a/chch-status.sh
+++ b/chch-status.sh
@@ -28,7 +28,7 @@ OLD_STATUS="$(cat "$STATUS_FILE" 2>/dev/null)"
 STATUS="$(echo status | ssh -q -p $SSHPORT $SSH_USER@$SSH_IP 2>/dev/null)"
 
 if [ -z "$STATUS" ]; then 
-	if [ -f "$SSH_SUCCESS_FILE" ] && test $(find "$SSH_SUCCESS_FILE" -mmin -$STATUS_NULL_DELAY_MINUTES -mmin +0); then
+	if [ -f "$SSH_SUCCESS_FILE" ] && test "$(find "$SSH_SUCCESS_FILE" -mmin -$STATUS_NULL_DELAY_MINUTES -mmin +0)"; then
 		STATUS="$OLD_STATUS"
 		[ -z "$STATUS" ] && STATUS="$STATUS_NULL"
 	else
@@ -40,8 +40,8 @@ fi
 
 TIMESTAMP_LASTCHANGE=$(stat -c '%Y' "$STATUS_FILE" 2>/dev/null) || TIMESTAMP_LASTCHANGE=$(date +%s)
 [ "$STATUS" != "$STATUS_NULL" ] && printf "%s\n" "$STATUS" > "$STATUS_FILE"
-if [ "$STATUS" == "$OLD_STATUS" -o "$STATUS" == "$STATUS_NULL" ]; then	
-	touch --date=@$TIMESTAMP_LASTCHANGE "$STATUS_FILE"
+if [ "$STATUS" == "$OLD_STATUS" ] || [ "$STATUS" == "$STATUS_NULL" ]; then
+	touch --date=@"$TIMESTAMP_LASTCHANGE" "$STATUS_FILE"
 else
 	TIMESTAMP_LASTCHANGE=$(stat -c '%Y' "$STATUS_FILE" 2>/dev/null)
 fi