Partial layering fix