merge params properly (bug 950908)