fixed too many arguments bug
Merge branch 'hotfix/bugfix'