fixed while even more