Yeah the upgrade being dead center also tripped me up a couple times. I finally managed to fix the bug for good, so it should all work fine now :)
