Fix for paths that contain spaces