fixup! WIP troubleshooting