OS Core fix