kind of hacking default behavior, need to reconsider "core" after this