Issue 262 token expiry