added check if Super* is selected