upgradepath bugfix, candidate for 0.6.1