Fixed for working with new version of descriptors