Fix to support latest platform. Buddy: Tim