Fix to work with more deeply nested files