fix for newer backend