#461 Fix all to work with the layer