Fix zeroing issue