Gfx: Additional change to 6e04fd9