fix 2, 4, 5, 7-10