Fixing selection options