Added parsing bug