Fix layering