fix 5 and 8 and 4