bug fixes: upgradeable property