Top-Level fix 7