core include fix