Fix bug #6069 - Build breaks with too many arguments to