Manan/Sumedha - Fixed going through the platform issue