System Core fix