Fixed SetCommand