Fixed cases where being in different zones would mean nothing.