Fix core (18/27)

Fix core