Fix core (16/27)

Fix core