nit: can you move this above the super call?