Fix core (19/27)

Fix core