[all]: fix for param ordering from pull request #148