Can we move this into the original if condition?