Fix for supporting context with datadriven descriptors