Fixed Heap corruption