It seems that layer switch is finally working well