implement next button fix #14