Fixed issue of args not counting from correct index