Fixed parsing bug
Been through this exact same problem before with possibly a different
class