Fixed argument handling