Fix for top-level packages also