Fixed arg counting bug
Merge branch 'fixArgBug' into develop