fix 39 40 44