Fixing Heap module