Fixed Command misbehaivior