Gfx: Additional change to 37fd105