Fixed issue with token refresh