Handle user variables in path correctly