Fix too many values causing a recursion bug