Fixed issue with command selection