fix next issues