Fixed handling descriptors