Feature/upgrade descriptor

I agree that we're wrong, but this makes us _inconsistent_