FIx problem with args and commends