LayerContainer fix