Removed elimination of zero values