fixed issue in parsing commands