Fix to create variables without full path, previous code was a work in
progress to get the full path working, but not ready yet.