Fixed arguments issue