Fix zipping without using teleporters when possible