Properly fix the 'cd $HOME' issue