Fix to wormhole class