#9 Layers being switched thanks to some changes in the core