m_pi issue resolved