Bug fix: double definitions of arguments