Make args in lhb-command more robust