Fixed bugs in the position of parameter setting
Merge pull request #702 from zuki/DS-2205

DS-2205: Fixed bugs in the position of parameter setting