Huge performance improvement for zero values (15x faster)