It's been moved up a lot, and it's not inside the condition. It shouldn't be necessary to move this at all.