Rearm one shot descriptors when necessary