diff --git a/home/user/.config/bash/functions b/home/user/.config/bash/functions
index 8f57dc5..5136605 100644
--- a/home/user/.config/bash/functions
+++ b/home/user/.config/bash/functions
@@ -220,10 +220,10 @@ most-often-commands() {
 
 # Disable tmux on remote machine
 ssht() {
-    ssh -t $@ 'TMUX=NO $SHELL -l'
+    TERM=tmux-256color ssh $@
 }
 
-# Enable X11Forwarding and disable mux session
+# Enable X11Forwarding and disable mux and tmux session
 sshx() {
-    ssh -X -o ControlMaster=no $@
+    ssht -X -o ControlMaster=no -o ControlPath=none $@
 }
\ No newline at end of file