fixes #112 - Now upgrades are evaluated correctly against the build order