Fixed findArgument function