Deal with expiry being either a number or a string