Prevent extra parse, fixing #214