make sure we handle spaces in paths
merged