improved hotswap behaviour