Fix core (11/27)

Fix core