Fix core (25/27)

Fix core