Fix core (20/27)

Fix core