Fixed a bug in the core