default parameter set bug fixed for Gateway too.
Merge pull request #3046 from akhadem/dev

default parameter-set fixed for Gateway too