Fix for 12 upgradability