fix setting order.
Merge branch 'hotfix/0.0.1-orderfix'