[Fix #1010] Add new Next cop
Adapt code to fulfill new Next cop