Be more explicit handling args