Fix core (14/27)

Fix core