Fixed layering in 1.2.1