Fix nasty bug of empty values blocking stream