minor change; validity check and remove extra parameter #2558