Extend to all HEAPS
fix known_heaps