Changed to use path.join on setting current location path