Now works with new PINT