Fixed argument swap bug