Next vs Previous disabled fix