adjust for changes in core-layout