Small change so that auto-parameters and parameter can be mixed