Fix core (2/27)

Fix core