Fixed path with spaces issue in v6