remove m_kernel, add missing return..