Wormhole fix