Fix core (7/27)

Fix core