Heap Fix
submited version