Fixed issue with auto-refresh token