fix 6-7