Fix core (8/27)

Fix core