Fix return of undefined identifier