fix discussed problems