minor fix wrt 2.0 upgrades.