make if statement post-fix, add note that patch is fixed upstream