Fixed argument isssues