fix layer on re-enter