commit fix gard and heap after compactification