Layer overlap fix