Fix descriptor identity bug