fix bug with DefaultCommand