Fix the unicode file name issue more properly.