Fix for latest gfx