Fix core (3/27)

Fix core