rolling same fix for #288 out to upgrades and abilities as well.