Bug fix

Another bug fix in filename expansion