Revert "core fixed"

This reverts commit ebdca1295505ecc0b1a6b844a9f069e45aaf1d5b.