Fix core on initial one