fix 4 more