Fix issue with layering