Fixed the usage of ICommand