Zero matrix fix up