Fixed bug with the expiration token