Fixed multiple command selection