Fix core (13/27)

Fix core