Small bug fix & add regex match for args