Core Settings fix