fix multi-file scoping