Fixed "Next" button issue