Fix problem with Next not always showing