Fix for path with spaces