Fix the expand problem with directory name end with number