Fix issue with multiple 'next' clicks