This fixes #7786.  It now accepts the extra parameter.