Fix the return of id