Revert "bugfix: incorrect argument indexing"

This reverts commit 17cb4ab84cc5a29595d2cb157441ea57ccedfb54.