Fixed output where empty values were ignored, including 0