Fix to allow for empty args