SLightly better hack for --fix-layers