Fix for has to communicate with SDC for Nst-selection enhancements