Finally the fix after consulting with upstream devs