Fixed argument processing bug