Fixed: heap corruption