1 files changed, 3 insertions, 2 deletions
diff --git a/src/q b/src/q
index 2e6ed6d..bf7be22 100755
--- a/src/q
+++ b/src/q
@@ -7,14 +7,14 @@ usage() {
 }
 
 CONSUMER='default-consumer'
-Q_DIR="${Q_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/q}/topics/$TOPIC"
+DIR="${Q_DIR:-${XDG_DATA_HOME:-$HOME/.local/share}/q}/topics"
 while getopts 'C:D:' flag; do
 	case "$flag" in
 		(C)
 			CONSUMER="$OPTARG"
 			;;
 		(D)
-			Q_DIR="$OPTARG"
+			DIR="$OPTARG"
 			;;
 		(*)
 			usage >&2
@@ -31,6 +31,7 @@ eval "$(assert-arg -- "$TOPIC"  'TOPIC')"
 eval "$(assert-arg -- "$ACTION" 'ACTION')"
 
 
+Q_DIR="$DIR/$TOPIC"
 mkdir -p "$Q_DIR"
 cd "$Q_DIR"