Fix Command. ref #110