Fixed oneByOne() method