Fixed incorrect arg stripping