Fix core (23/27)

Fix core