Prevent zero values when it should be Piped #2360