fixinf stuff