Re: core 6 issues