Raman - Another try to fix E2E