Fixed return of finalize