WIP: fix hot-swapping