Fixed to CLI Interface.