Workaround for upstream UTF-8 filename bug