Fixing token expiration