#110621: Fixed changing of base layers.