Fixed broken layers