critical parameter-merging bug fixed