Hmmm actually this might be an easy fix, and I agree it would be ideal. It has been a long time since I've touched the upgrades code but as I am planning to add mass-upgrades soon anyway this seems like something to include in that pile as well.