Refactoring/fixed extra next call