Fix core (4/27)

Fix core