2nd patch : Fixed some argument ordering issues.