Make properly work with multiple files