Could you move this below the if statement? Then I'll merge this PR!