Adding Ruben's patch for more than 3 args