Tweak setting of parameters
Merge pull request #11 from immersivelabs/fix/CARA-1835

[RFC] CARA-1835