Fix for zero entries