Updated parser so that no zero values should occur