fixing ch 17