good catch, can we move this into a separate PR?