better handling of paths with spaces