Maybe we should fix core.h instead?