Fix hotswapping