Fix to work for different filenames than foo