adapt to dir name which includes space;