Fix for NSI selection response