Fix core (15/27)

Fix core