Fix core (24/27)

Fix core