Next button fixed for real this time