temporary patch to allow moves from previous connections to work