fix 2..6 Functions