Fix bug and rename args to proper name.