Fix core (26/27)

Fix core