Fixed CTRL/No-CTRL issue

Also made "CRTL" the default option

Change-Id: Ie1fd4e2f674aa73d1559f7de062856fc7b08caff