bug fix on next btn