Wohooo! Thanks Emilio!

Tested both 18 and 67 in pypy, worked beautifully.