and more tinkering to fix it