fix on core