fix 79, fix 70, fix 65