fix 45
16 & 17