fix next bugs