Avoid direct descriptor comparison, so the fix can be shown

Avoid direct descriptor comparison, so the fix can be shown #811