Fixed layers issue